Fixing issue #64 once and for all!