Debug fix [DONE]