Fix #314 and also add it to the developer help for #480