#515 fixes