Fix for clipping issue + versioing