fixed Vaidux's problem