Fix for laser and WC