Close #302 - More lenient binary system