FIX: multiple fixes for ?? function.