Adding bugfix again