hacky way to fix #7
changed implementation