Compare #268 
Though IMHO this is fine for now, at least follows the current broken behaviour of the other place.
Proper fix (for both/in general) should be done as a next step.