Fix for Funky v2