Fix #41, forgot some conditions