Trying to fix some bug