FIX: fix after old code deletion