[Emily,Remo] bugfix #471