Fixed #64, tested on home PC.