Fix for race condition with frame creation
WOD external not needed anymore