addresses #50
addresses #50