Plug2 fix

Fixes JIRAs PLUG-2, PLUG-4 and PLUG-7.