Fixed #1 (thanks DirkBurger)