fixed c4-030
minor improvements