Address issue #5 but need to be adjusted