ugly fix for outstanding call error