Added temporary fix