manually merged with updated bug decorator