Change for better support postgres (only for me)