Fixed merge issues - Kevin (kchen87)