bug related to previous commit fixed

sha 2e4641d0dade1cc3364b5b65a1c5c96b496c9b59