Attempted bugfix..