Fix for Issue #15 (TESTED under OpenBSD 5.6 i386 with VirtualBox)