fix loader and double kill