Fix for long loading because of pictures