fix some issues when user did not use it correctly.