Remove the bug, self calculating really make things complicated