Fix for version handler