Fix from CAF Merge

Signed-off-by: Paul <javelinanddart@gmail.com>