Fix #1472

#1472 
Tested on Chrome and Firefox