Fix path
Fix commutation issue