trying to fix some bug