Bug Fix - 20140704-001