Removed dublicate blocks
Fix issue with coma