Core Keeper

Hotfix 0.6.3.1