Fixed aqua bug

More precisely added code that Tom already created but was lost in
dropbox merge into GitHub