Fixing some bug