Fix: Issue 16 and image-only mode hack