fixing same bug again...