this should fix #5 and #6
this should fix #5 and #6