tried to fix #276. Not yet fixed