Fix for kicks caused by v1.08 update