and now proper fix for #10 and #4