patch 5/30 bug