jopadan fixed bug introduced by code changes