Resolving code blocks issue