Removed last line to prevent auto return