Fixes HYPR-21 and HYPR-14