Fixes some issue