Trying to fix #2