Fix #11 by @Archetrix