This should fix #24