Fixed some scatter