fixes according to test mail