modify
fix collision