HotFix: to get #496 and #497