more stupid rearranging
bugfix