Final fix #1243