Support for issue #76 of RS