Not efficient fix