Bug fix for prism & x-ray

Temp bug fix, will need to finish