Hopefully resolved #7