changes for production support
fix collision