Quick fix of broken function