Fixed hqcp creation