Fixes some bug