lol, damn refactoring :-)