bugfix #9 ... really