[#15] Fixed context matching