Fixed already Bug #2