bug in previous commit fixed