477 partial fix