Fixed some behavior..