Hope this would fix all bugs