Cleaned up trigger collision