Ugly hack attempt