Fixed JS by Valera