Add another safety net, should really be debugged properly