Fix any Hajjs Fixes #21