Tried to fix #1061