Fixed issue on modifying activity