Improved / better clip bounds handling