* Temporary fix for checkbox issue * Error Fix