Fix for issue #118 (thanks @Kelp404!)