Proper fix for #6 and #7