Fixes #624 Missing check to disable features