WIP Fix for #301 - What do you think? 

See https://github.com/concrete5/concrete5-5.7.0/issues/301
#301