m5: merged in hammer fix