this fixes two problems: