Fixed issues with new box selection