Fix for PLA-588 (clicktracking)