Fixed issue #36 again :)