Fixed the bug with B05003B (and others).