This should fix all block setting bugs once and for all