should fix #24