NEUROP-1126

• No obvious problem from the code
• Implemented stronger check just to avoid browser issues (but it's just a thought)
• Tests befoe and after modifies don't show problems