Bug fix: something wrong