Resolves #403

Thanks @kotoroshinoto for the help!