Fix for Showcase in 2.3 and below