More thorough debug
V 0.0.7