Fix anomally described in #435