Fix static image factory