Quick fix for the clipping and slight performance improvement