Fix of issue #528 with updated tests