Attempt to fix #24