Fixed the multiple block issue