Might fix #17 please check.