fixed bug in previous changes