Fix for 0001109 #3363