Bug fix (publish v1.53)