patch 3 bug fixing