should fix #285