Modified Bug fix to preserve speed