Fix for inline properties