fixes #17 | uncomplete