fixed issues with Shayon