Fix/#4