Moved return code onto buffer line