this should fix #3