Fixed images problem, need to be tested