Fixed before upload to live server