Fixed for #64 and #65