fixed shan's thing