Fixed issues with returns and columns