resolved issue #12 in bad fashion