fixes #479
fixes #480