Remove message. And fix bug introduced in previuos commit