Bug fixes: 55, 56, 57