Fixed some behavior