Fixed and force pushed with a217262.