fixes regarding #523