Fixing #30 in a better way ;)