JC-1508 Fixed interface implementation.