working on #5
bugfix