This should be addressed before meging. Any ideas?