Possibly fixes demo-photo issue