cut bug fixes