Handling glitch from BZ#1112574