Fixing 4.2 bug