Added temporary fix for member bug