fixed issue GH-6 (thanks to ShaKeSPeaR)