added guard to binstubs