Fixing some unknown issue