Adding bugfix