pulling linnea's fix
merge