This should probably fix #15