issue 12 - partially fixed