I know, we need to refactor this .. but lets solve the bug