Core Keeper

Hotfix 0.5.2.1