Fix for dynamic image locations