Fixed that bug
Demo-able