Quick fix for Formotion issue