Some fixings needs to be tested