- Fixed the issue that was supposed to be fixed by my previous commit (fixes issue #32)