Fixed issues with GW data

Lauri Himanenrequested to merge
gw-fix into v1.0.0

This fixes #596 (closed) and is also a part of #624 (closed).

Merge request reports