RC.0.1 - Fixed against javascript attacks