Add condition back that was removed for testing last commit