Fix #36, @akeru well spotted!