[core] Final Bug Fix. Passes all test. Ready to be pushed to Master