finally fixing issue #3 that i opened forever ago