this should fix #13?