Bug fix... must check for callback before calling it.