FIXES: #288
FIXES: #306