#380: Implemented