Fixed a bug (again...)