Fixing same bug that was in features for releases