Fix switching to calling buffer

References #115.