ticket #1 hot fix