Fixed some wrong code-path