Fix conditional model

closes #157
@marcelluethi 
Yes, it was a very small change ;)