regexp for smarter handling of blocks fixed.