Masonry bug fix