Try to resolve #27