Fix for Gallery