fixed last issues