Fix #456 & #457