Trying to fix #4