some fixes with return = TRUE parameter