Bug fix #1, closes last1here/master#1