Temporary bug fix. Improved version coming.