Bug fix for the bug fix