Attempt to fix #6