solve some issues with the previous commits