Phase I Bug Fix