Slight improvement of sh!