fixes #636, conditionals broken from f1ad4698613d59bc2648b359accd6c6e196434cc