Fix: Less fancy, more simple