hooks to address issue #25