Beter fix to previous fix