quality fix to oneclickwatch