Bugfix - respect  property (it was always on before)
Fix merge conflict