[PATCH] Fix deviation overflow