Try to fix #3