Adding a non-elegant bugfix.