Try to fix #6