Close #1
Setup check on twice entry