Fixed the quasi-fix for the bug with CAP support