Added a new bugfix