test code + fix