Tried to fix #373...