added switch + fixed double jump on trigger collision