fixed bug in previous fix