Add uncommitted changes
Compatibility fix for new hammer version
Compatibility fix for new hammer ver