Resolving #1391, #1546, #1552