Tries to fix #1