Fix multiple kicks problem

Brickimedia/brickimedia#215

Change-Id: I28daed3c15a711b85551c661ea5d875cf9a18eae
Merge "Fix multiple kicks problem"