this should fix #4