solving final bug`