Issue/#425

Resolves #425