Tries to fix #3