FIX: fixed assertion errors