Fixing HProp