fixes according to @9c60d417bf525fc33a34c5fc59df39d62324d586