Proper operator recognition #115