Images bug fix