#132: hard code fix