Fixiing bug