fixing issues..