Fixed issue when custom message set is enabled