Fixed a issues