Minor issue solving