implements #133