Tried some fixes