Thanks Luis!
James Gilbertson to be clear this will only be fixed in the new enhancer developed for 5.0, not the old enhancer from 4.3 and earlier.