diff --git a/README.md b/README.md
index 877b98b..ec3af2a 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ Command Line User Interface (Console UI inspired by TurboVision) with built-in t
 
 
 ## Current version
-The current version is 0.9.0 RC3. Please see details in [changelog](./changelog).
+The current version is 0.9.0 RC5. Please see details in [changelog](./changelog).
 
 ## Applications that uses the library
 * Terminal FB2 reader(termfb2): https://github.com/VladimirMarkelov/termfb2
diff --git a/VERSION b/VERSION
index d6ba093..9af2979 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.9.0-rc4
+0.9.0-rc5
diff --git a/changelog b/changelog
index 83252ef..6ca7f4a 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,6 @@
+2018-10-08 - version 0.9.0 RC5
+[*] Fix Frame border drawing
+
 2018-09-30 - version 0.9.0 RC4
 [+] New feature: borderless windows (thanks to Mark D Horn)
 [+] ScrollTo API for scrollable frame
diff --git a/frame.go b/frame.go
index 4a44533..1fc447a 100644
--- a/frame.go
+++ b/frame.go
@@ -101,7 +101,6 @@ func (f *Frame) Draw() {
 	x, y, w, h := f.Clipper()
 
 	if f.scrollable {
-
 		_, fy := f.Pos()
 		_, fh := f.Size()
 		_, fpy := f.Paddings()
@@ -146,7 +145,9 @@ func (f *Frame) Draw() {
 
 	SetTextColor(fg)
 	SetBackColor(bg)
-	DrawFrame(x, y, w, h, f.border)
+	fx, fy := f.Pos()
+	fw, fh := f.Size()
+	DrawFrame(fx, fy, fw, fh, f.border)
 
 	if f.title != "" {
 		str := f.title