Quick fix for #10. I will improve this features