Fix for bad, bad errors in Assembly