adress issue #25. need confirmation if this is desired behavior