fixed bug due to re-organization