Setting fixes, enabled enableRetraction setting