Fix dependecy issue introduced by #455