#1600 - Fixed for FF