changed some things, #1475