fixed #24
#12
#12 partly fixed (no rect border)