Fix for this bug