Fixed and updated to support 6.1