Added check to weight to close #1