on the way to fix issues patch 2