too tired to figure out how to fix short-circuiting at the moment, lets try something else