a long awaited bugfix