Only append image suffix when necessary