Added exception for images