Fix #34 (the off was not working)