Fix for showcase