fixes #5
fisex #9
already resolved before