Fix broken constraint issue
Double returns are silly