Fixes #223

Thanks @nightowl77