Fix for 91c655 #3