fixed some strange issues