Kevin swipe composer fix

Merged with thibultizanini codes
@kevinluosl I think you forget to remove this code