Fixed 'overescaping'