#356 fix for logic error in setup

This should fix the problem. I think the logic error was introduced in 0c4cd1e8f4d5fa8846e694a93b639e951b9b654d.