Bug fix for 0, 1 and 2