New version with bugfix