fixing issues!