Fix for draw issue in Safari