[#552] fixed shape drawing in debug mode when additional shapes are being used