Seems to fix #6