Little bit of testing and fixing